Merge pull request #29 from depools/feat/bls12-381

Feat/bls12 381
2020-09-02 19:37:04 +03:00 · 2020-09-02 19:37:04 +03:00 · 9cde1cd0ef
parent 2199f5a7b3 1123ca0243
commit 9cde1cd0ef
15 changed files with 121 additions and 113 deletions
--- a/airgapped/airgapped.go
+++ b/airgapped/airgapped.go
@ -3,21 +3,23 @@ package airgapped
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/depools/dc4bc/fsm/state_machines/signing_proposal_fsm"
 	"log"
 	"sync"

+	vss "github.com/corestario/kyber/share/vss/rabin"
+
+	"github.com/corestario/kyber"
+	"github.com/corestario/kyber/encrypt/ecies"
 	client "github.com/depools/dc4bc/client/types"
 	"github.com/depools/dc4bc/dkg"
 	"github.com/depools/dc4bc/fsm/fsm"
 	"github.com/depools/dc4bc/fsm/state_machines/dkg_proposal_fsm"
 	"github.com/depools/dc4bc/fsm/state_machines/signature_proposal_fsm"
+	"github.com/depools/dc4bc/fsm/state_machines/signing_proposal_fsm"
 	"github.com/depools/dc4bc/fsm/types/requests"
 	"github.com/depools/dc4bc/qr"
+	bls12381 "github.com/depools/kyber-bls12381"
 	"github.com/syndtr/goleveldb/leveldb"
-	"go.dedis.ch/kyber/v3"
-	"go.dedis.ch/kyber/v3/encrypt/ecies"
-	"go.dedis.ch/kyber/v3/pairing/bn256"
 )

 const (
@ -36,7 +38,7 @@ type AirgappedMachine struct {

 	pubKey kyber.Point
 	secKey kyber.Scalar
-	suite  *bn256.Suite
+	suite  vss.Suite

 	db *leveldb.DB
 }
@ -51,7 +53,7 @@ func NewAirgappedMachine(dbPath string) (*AirgappedMachine, error) {
 		qrProcessor:  qr.NewCameraProcessor(),
 	}

-	am.suite = bn256.NewSuiteG2()
+	am.suite = bls12381.NewBLS12381Suite()

 	if am.db, err = leveldb.OpenFile(dbPath, nil); err != nil {
 		return nil, fmt.Errorf("failed to open db file %s for keys: %w", dbPath, err)
--- a/airgapped/airgapped_test.go
+++ b/airgapped/airgapped_test.go
@ -4,6 +4,10 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
+	"sync"
+	"testing"
+	"time"
+
 	client "github.com/depools/dc4bc/client/types"
 	"github.com/depools/dc4bc/fsm/fsm"
 	"github.com/depools/dc4bc/fsm/state_machines/dkg_proposal_fsm"
@ -13,9 +17,6 @@ import (
 	"github.com/depools/dc4bc/fsm/types/responses"
 	"github.com/depools/dc4bc/storage"
 	"github.com/google/uuid"
-	"sync"
-	"testing"
-	"time"
 )

 const (
@ -31,7 +32,7 @@ type Node struct {
 	deals         []requests.DKGProposalDealConfirmationRequest
 	responses     []requests.DKGProposalResponseConfirmationRequest
 	masterKeys    []requests.DKGProposalMasterKeyConfirmationRequest
-	partialSigns  []requests.SigningProposalPartialKeyRequest
+	partialSigns  []requests.SigningProposalPartialSignRequest
 }

 func (n *Node) storeOperation(t *testing.T, msg storage.Message) {
@ -60,8 +61,8 @@ func (n *Node) storeOperation(t *testing.T, msg storage.Message) {
 			t.Fatalf("failed to unmarshal fsm req: %v", err)
 		}
 		n.masterKeys = append(n.masterKeys, req)
-	case signing_proposal_fsm.EventSigningPartialKeyReceived:
-		var req requests.SigningProposalPartialKeyRequest
+	case signing_proposal_fsm.EventSigningPartialSignReceived:
+		var req requests.SigningProposalPartialSignRequest
 		if err := json.Unmarshal(msg.Data, &req); err != nil {
 			t.Fatalf("failed to unmarshal fsm req: %v", err)
 		}
@ -259,7 +260,7 @@ func TestAirgappedAllSteps(t *testing.T) {
 			SrcPayload: msgToSign,
 		}

-		op := createOperation(t, string(signing_proposal_fsm.StateSigningAwaitPartialKeys), "", payload)
+		op := createOperation(t, string(signing_proposal_fsm.StateSigningAwaitPartialSigns), "", payload)

 		operation, err := n.Machine.HandleOperation(op)
 		if err != nil {
@ -284,7 +285,7 @@ func TestAirgappedAllSteps(t *testing.T) {
 			payload.Participants = append(payload.Participants, &p)
 		}
 		payload.SrcPayload = msgToSign
-		op := createOperation(t, string(signing_proposal_fsm.StateSigningPartialKeysCollected), "", payload)
+		op := createOperation(t, string(signing_proposal_fsm.StateSigningPartialSignsCollected), "", payload)

 		operation, err := n.Machine.HandleOperation(op)
 		if err != nil {
--- a/airgapped/bls.go
+++ b/airgapped/bls.go
@ -3,12 +3,15 @@ package airgapped
 import (
 	"encoding/json"
 	"fmt"
+
+	"github.com/corestario/kyber/pairing"
+
+	"github.com/corestario/kyber/sign/bls"
+	"github.com/corestario/kyber/sign/tbls"
 	client "github.com/depools/dc4bc/client/types"
 	"github.com/depools/dc4bc/fsm/state_machines/signing_proposal_fsm"
 	"github.com/depools/dc4bc/fsm/types/requests"
 	"github.com/depools/dc4bc/fsm/types/responses"
-	"go.dedis.ch/kyber/v3/sign/bls"
-	"go.dedis.ch/kyber/v3/sign/tbls"
 )

 func (am *AirgappedMachine) handleStateSigningAwaitConfirmations(o *client.Operation) error {
@ -110,7 +113,7 @@ func (am *AirgappedMachine) createPartialSign(msg []byte, dkgIdentifier string)
 		return nil, fmt.Errorf("failed to load blsKeyring: %w", err)
 	}

-	return tbls.Sign(am.suite, blsKeyring.Share, msg)
+	return tbls.Sign(am.suite.(pairing.Suite), blsKeyring.Share, msg)
 }

 func (am *AirgappedMachine) recoverFullSign(msg []byte, sigShares [][]byte, t, n int, dkgIdentifier string) ([]byte, error) {
@ -119,7 +122,7 @@ func (am *AirgappedMachine) recoverFullSign(msg []byte, sigShares [][]byte, t, n
 		return nil, fmt.Errorf("failed to load blsKeyring: %w", err)
 	}

-	return tbls.Recover(am.suite, blsKeyring.PubPoly, msg, sigShares, t, n)
+	return tbls.Recover(am.suite.(pairing.Suite), blsKeyring.PubPoly, msg, sigShares, t, n)
 }

 func (am *AirgappedMachine) verifySign(msg []byte, fullSignature []byte, dkgIdentifier string) error {
@ -128,5 +131,5 @@ func (am *AirgappedMachine) verifySign(msg []byte, fullSignature []byte, dkgIden
 		return fmt.Errorf("failed to load blsKeyring: %w", err)
 	}

-	return bls.Verify(am.suite, blsKeyring.PubPoly.Commit(), msg, fullSignature)
+	return bls.Verify(am.suite.(pairing.Suite), blsKeyring.PubPoly.Commit(), msg, fullSignature)
 }
--- a/airgapped/dkg.go
+++ b/airgapped/dkg.go
@ -3,6 +3,9 @@ package airgapped
 import (
 	"encoding/json"
 	"fmt"
+
+	"github.com/corestario/kyber"
+	dkgPedersen "github.com/corestario/kyber/share/dkg/pedersen"
 	client "github.com/depools/dc4bc/client/types"
 	"github.com/depools/dc4bc/dkg"
 	"github.com/depools/dc4bc/fsm/state_machines/dkg_proposal_fsm"
@ -10,9 +13,7 @@ import (
 	"github.com/depools/dc4bc/fsm/types/requests"
 	"github.com/depools/dc4bc/fsm/types/responses"
 	"github.com/depools/dc4bc/storage"
-	"go.dedis.ch/kyber/v3"
-	"go.dedis.ch/kyber/v3/pairing/bn256"
-	dkgPedersen "go.dedis.ch/kyber/v3/share/dkg/pedersen"
+	bls12381 "github.com/depools/kyber-bls12381"
 )

 func createMessage(o client.Operation, data []byte) storage.Message {
@ -92,7 +93,7 @@ func (am *AirgappedMachine) handleStateDkgCommitsAwaitConfirmations(o *client.Op
 	}

 	for _, entry := range payload {
-		pubKey := bn256.NewSuiteG2().Point()
+		pubKey := bls12381.NewBLS12381Suite().Point()
 		if err = pubKey.UnmarshalBinary(entry.DkgPubKey); err != nil {
 			return fmt.Errorf("failed to unmarshal pubkey: %w", err)
 		}
--- a/client/client_test.go
+++ b/client/client_test.go
@ -5,13 +5,13 @@ import (
 	"crypto/ed25519"
 	"encoding/json"
 	"errors"
-	"github.com/depools/dc4bc/client/types"
 	"os"
 	"path/filepath"
 	"testing"
 	"time"

 	"github.com/depools/dc4bc/client"
+	"github.com/depools/dc4bc/client/types"
 	"github.com/depools/dc4bc/fsm/state_machines"
 	spf "github.com/depools/dc4bc/fsm/state_machines/signature_proposal_fsm"
 	"github.com/depools/dc4bc/fsm/types/requests"
@ -98,7 +98,7 @@ func TestClient_ProcessMessage(t *testing.T) {
 		}
 		message.Signature = ed25519.Sign(senderKeyPair.Priv, message.Bytes())

-		state.EXPECT().SaveOffset(uint64(1)).Times(1).Return(nil)
+		state.EXPECT().SaveOffset(gomock.Any()).Times(1).Return(nil)
 		state.EXPECT().SaveFSM(gomock.Any(), gomock.Any()).Times(1).Return(nil)
 		state.EXPECT().PutOperation(gomock.Any()).Times(1).Return(nil)

@ -115,14 +115,19 @@ func TestClient_GetOperationsList(t *testing.T) {
 	)
 	defer ctrl.Finish()

-	state := clientMocks.NewMockState(ctrl)
+	userName := "test_client"
+
 	keyStore := clientMocks.NewMockKeyStore(ctrl)
+	testClientKeyPair := client.NewKeyPair()
+	keyStore.EXPECT().LoadKeys(userName, "").Times(1).Return(testClientKeyPair, nil)
+
+	state := clientMocks.NewMockState(ctrl)
 	stg := storageMocks.NewMockStorage(ctrl)
 	qrProcessor := qrMocks.NewMockProcessor(ctrl)

 	clt, err := client.NewClient(
 		ctx,
-		"test_client",
+		userName,
 		state,
 		stg,
 		keyStore,
@ -158,14 +163,19 @@ func TestClient_GetOperationQRPath(t *testing.T) {
 	)
 	defer ctrl.Finish()

-	state := clientMocks.NewMockState(ctrl)
+	userName := "test_client"
+
 	keyStore := clientMocks.NewMockKeyStore(ctrl)
+	testClientKeyPair := client.NewKeyPair()
+	keyStore.EXPECT().LoadKeys(userName, "").Times(1).Return(testClientKeyPair, nil)
+
+	state := clientMocks.NewMockState(ctrl)
 	stg := storageMocks.NewMockStorage(ctrl)
 	qrProcessor := qrMocks.NewMockProcessor(ctrl)

 	clt, err := client.NewClient(
 		ctx,
-		"test_client",
+		userName,
 		state,
 		stg,
 		keyStore,
@ -205,14 +215,19 @@ func TestClient_ReadProcessedOperation(t *testing.T) {
 	)
 	defer ctrl.Finish()

-	state := clientMocks.NewMockState(ctrl)
+	userName := "test_client"
+
 	keyStore := clientMocks.NewMockKeyStore(ctrl)
+	testClientKeyPair := client.NewKeyPair()
+	keyStore.EXPECT().LoadKeys(userName, "").Times(1).Return(testClientKeyPair, nil)
+
+	state := clientMocks.NewMockState(ctrl)
 	stg := storageMocks.NewMockStorage(ctrl)
 	qrProcessor := qrMocks.NewMockProcessor(ctrl)

 	clt, err := client.NewClient(
 		ctx,
-		"test_client",
+		userName,
 		state,
 		stg,
 		keyStore,
@ -225,14 +240,12 @@ func TestClient_ReadProcessedOperation(t *testing.T) {
 		ID:        "operation_id",
 		Type:      types.DKGCommits,
 		Payload:   []byte("operation_payload"),
-		Result:    []byte("operation_result"),
 		CreatedAt: time.Now(),
 	}
 	processedOperation := &types.Operation{
 		ID:        "operation_id",
 		Type:      types.DKGCommits,
 		Payload:   []byte("operation_payload"),
-		Result:    []byte("operation_result"),
 		CreatedAt: time.Now(),
 	}
 	processedOperationBz, err := json.Marshal(processedOperation)
@ -241,10 +254,6 @@ func TestClient_ReadProcessedOperation(t *testing.T) {
 	qrProcessor.EXPECT().ReadQR().Return(processedOperationBz, nil).Times(1)
 	state.EXPECT().GetOperationByID(processedOperation.ID).Times(1).Return(operation, nil)
 	state.EXPECT().DeleteOperation(processedOperation.ID).Times(1)
-	stg.EXPECT().Send(gomock.Any()).Times(1)
-
-	keyPair := client.NewKeyPair()
-	keyStore.EXPECT().LoadKeys("test_client", "").Times(1).Return(keyPair, nil)

 	err = clt.ReadProcessedOperation()
 	req.NoError(err)
--- a/client/state_test.go
+++ b/client/state_test.go
@ -1,11 +1,12 @@
 package client_test

 import (
-	"github.com/depools/dc4bc/client/types"
 	"os"
 	"testing"
 	"time"

+	"github.com/depools/dc4bc/client/types"
+
 	"github.com/depools/dc4bc/client"
 	"github.com/stretchr/testify/require"
 )
@ -43,7 +44,6 @@ func TestLevelDBState_PutOperation(t *testing.T) {
 		ID:        "operation_id",
 		Type:      types.DKGCommits,
 		Payload:   []byte("operation_payload"),
-		Result:    []byte("operation_result"),
 		CreatedAt: time.Now(),
 	}
 	err = stg.PutOperation(operation)
@ -54,7 +54,6 @@ func TestLevelDBState_PutOperation(t *testing.T) {
 	req.Equal(operation.ID, loadedOperation.ID)
 	req.Equal(operation.Type, loadedOperation.Type)
 	req.Equal(operation.Payload, loadedOperation.Payload)
-	req.Equal(operation.Result, loadedOperation.Result)

 	err = stg.PutOperation(operation)
 	req.Error(err)
@ -74,7 +73,6 @@ func TestLevelDBState_GetOperations(t *testing.T) {
 		ID:        "operation_1",
 		Type:      types.DKGCommits,
 		Payload:   []byte("operation_payload"),
-		Result:    []byte("operation_result"),
 		CreatedAt: time.Now(),
 	}
 	err = stg.PutOperation(operation)
@ -103,7 +101,6 @@ func TestLevelDBState_DeleteOperation(t *testing.T) {
 		ID:        "operation_id",
 		Type:      types.DKGCommits,
 		Payload:   []byte("operation_payload"),
-		Result:    []byte("operation_result"),
 		CreatedAt: time.Now(),
 	}
 	err = stg.PutOperation(operation)
--- a/cmd/client/main.go
+++ b/cmd/client/main.go
@ -7,6 +7,8 @@ import (
 	"os/signal"
 	"syscall"

+	"github.com/depools/dc4bc/airgapped"
+
 	"github.com/depools/dc4bc/client"
 	"github.com/depools/dc4bc/qr"
 	"github.com/depools/dc4bc/storage"
@ -79,9 +81,12 @@ var rootCmd = &cobra.Command{

 		processor := qr.NewCameraProcessor()

-		// TODO: create state machine.
+		airgappedMachine, err := airgapped.NewAirgappedMachine("/tmp/dc4bc_node_%d_airgapped_db")
+		if err != nil {
+			log.Fatalf("Failed to create airgapped machine: %v", err)
+		}

-		cli, err := client.NewClient(ctx, userName, state, stg, keyStore, processor)
+		cli, err := client.NewClient(ctx, userName, state, stg, keyStore, processor, airgappedMachine)
 		if err != nil {
 			log.Fatalf("Failed to init client: %v", err)
 		}
--- a/dkg/dkg.go
+++ b/dkg/dkg.go
@ -3,14 +3,15 @@ package dkg
 import (
 	"errors"
 	"fmt"
-	"go.dedis.ch/kyber/v3/share"
 	"math"
 	"sort"
 	"sync"

-	"go.dedis.ch/kyber/v3"
-	dkg "go.dedis.ch/kyber/v3/share/dkg/pedersen"
-	vss "go.dedis.ch/kyber/v3/share/vss/pedersen"
+	"github.com/corestario/kyber/share"
+
+	"github.com/corestario/kyber"
+	dkg "github.com/corestario/kyber/share/dkg/pedersen"
+	vss "github.com/corestario/kyber/share/vss/pedersen"
 )

 // TODO: dump necessary data on disk
--- a/dkg/types.go
+++ b/dkg/types.go
@ -5,9 +5,12 @@ import (
 	"encoding/gob"
 	"encoding/json"
 	"fmt"
-	"go.dedis.ch/kyber/v3"
-	"go.dedis.ch/kyber/v3/pairing/bn256"
-	"go.dedis.ch/kyber/v3/share"
+
+	"github.com/corestario/kyber/pairing"
+
+	"github.com/corestario/kyber"
+	"github.com/corestario/kyber/share"
+	bls12381 "github.com/depools/kyber-bls12381"
 )

 type PK2Participant struct {
@ -151,20 +154,20 @@ func LoadBLSKeyringFromBytes(data []byte) (*BLSKeyring, error) {

 	commitments := make([]kyber.Point, 0, len(blsKeyringJson.Commitments))
 	for _, commitmentBz := range blsKeyringJson.Commitments {
-		commitment := bn256.NewSuiteG2().Point()
+		commitment := bls12381.NewBLS12381Suite().Point()
 		if err := commitment.UnmarshalBinary(commitmentBz); err != nil {
 			return nil, fmt.Errorf("failed to unmarshal commitment: %w", err)
 		}
 		commitments = append(commitments, commitment)
 	}

-	priShare, privDec := &share.PriShare{V: bn256.NewSuite().G1().Scalar()}, gob.NewDecoder(bytes.NewBuffer(blsKeyringJson.Share))
+	priShare, privDec := &share.PriShare{V: bls12381.NewBLS12381Suite().(pairing.Suite).G1().Scalar()}, gob.NewDecoder(bytes.NewBuffer(blsKeyringJson.Share))
 	if err := privDec.Decode(priShare); err != nil {
 		return nil, fmt.Errorf("failed to share: %v", err)
 	}

 	return &BLSKeyring{
-		PubPoly: share.NewPubPoly(bn256.NewSuiteG2(), nil, commitments),
+		PubPoly: share.NewPubPoly(bls12381.NewBLS12381Suite(), nil, commitments),
 		Share:   priShare,
 	}, nil
 }
--- a/go.mod
+++ b/go.mod
@ -3,6 +3,8 @@ module github.com/depools/dc4bc
 go 1.13

 require (
+	github.com/corestario/kyber v1.3.0
+	github.com/depools/kyber-bls12381 v0.0.0-20200831104422-978ac58f592e
 	github.com/golang/mock v1.4.4
 	github.com/google/uuid v1.1.1
 	github.com/juju/fslock v0.0.0-20160525022230-4d5c94c67b4b
@ -12,14 +14,9 @@ require (
 	github.com/spf13/cobra v1.0.0
 	github.com/stretchr/testify v1.6.1
 	github.com/syndtr/goleveldb v1.0.0
-	go.dedis.ch/kyber/v3 v3.0.9
-	gocv.io/x/gocv v0.23.0
-	golang.org/x/image v0.0.0-20200618115811-c13761719519
+	gocv.io/x/gocv v0.24.0
 	golang.org/x/text v0.3.3 // indirect
 	golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 // indirect
 )

-replace (
-	go.dedis.ch/kyber/v3 => github.com/corestario/kyber/v3 v3.0.0-20200218082721-8ed10c357c05
-	golang.org/x/crypto => github.com/tendermint/crypto v0.0.0-20180820045704-3764759f34a5
-)
+replace golang.org/x/crypto => github.com/tendermint/crypto v0.0.0-20180820045704-3764759f34a5
--- a/go.sum
+++ b/go.sum
@ -1,5 +1,4 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
@ -14,16 +13,16 @@ github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc
 github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
-github.com/corestario/kyber/v3 v3.0.0-20200218082721-8ed10c357c05 h1:ICuDs+sbQzDem2pIAFyI+u6s0RiETzMc2IhnobgHkvE=
-github.com/corestario/kyber/v3 v3.0.0-20200218082721-8ed10c357c05/go.mod h1:kXy7p3STAurkADD+/aZcsznZGKVHEqbtmdIzvPfrs1U=
+github.com/corestario/kyber v1.3.0 h1:SEWofdorUUeAJTsa9WJmrUYFyWHSWyXLgqDTFFEIzes=
+github.com/corestario/kyber v1.3.0/go.mod h1:kIWfWekm8kSJNti3Fo3DCV0GHEH050MWQrdvZdefbkk=
 github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/depools/kyber-bls12381 v0.0.0-20200831104422-978ac58f592e h1:pi/Oli1/ryp6wx4vbGM9qEBd6LDqFN5xH+FG72x2H8I=
+github.com/depools/kyber-bls12381 v0.0.0-20200831104422-978ac58f592e/go.mod h1:4sthQ2LjQIoysUBx/d+QbtjXksr3L0mgKf/Wuzy1M/4=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
-github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
@ -37,9 +36,7 @@ github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4er
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.4.4 h1:l75CXGRSwbaYNpl/Z2X1XIIAMSCquvXgpVZDhwEIJsc=
 github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
-github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db h1:woRePGFeVFfLKN/pOkfl+p/TAqKOfFu+7KPlMVpok/w=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
@ -52,24 +49,20 @@ github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmg
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
 github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
-github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
-github.com/jinzhu/configor v1.2.0 h1:u78Jsrxw2+3sGbGMgpY64ObKU4xWCNmNRJIjGVqxYQA=
-github.com/jinzhu/configor v1.2.0/go.mod h1:nX89/MOmDba7ZX7GCyU/VIaQ2Ar2aizBl2d3JLF/rDc=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
 github.com/juju/fslock v0.0.0-20160525022230-4d5c94c67b4b h1:FQ7+9fxhyp82ks9vAuyPzG0/vVbWwMwLJ+P6yJI5FN8=
 github.com/juju/fslock v0.0.0-20160525022230-4d5c94c67b4b/go.mod h1:HMcgvsgd0Fjj4XXDkbjdmlbI505rUPBs6WBMYg2pXks=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
+github.com/kilic/bls12-381 v0.0.0-20200607163746-32e1441c8a9f h1:qET3Wx0v8tMtoTOQnsJXVvqvCopSf48qobR6tcJuDHo=
+github.com/kilic/bls12-381 v0.0.0-20200607163746-32e1441c8a9f/go.mod h1:XXfR6YFCRSrkEXbNlIyDsgXVNJWVUV30m/ebkVy9n6s=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
-github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/looplab/fsm v0.1.0 h1:Qte7Zdn/5hBNbXzP7yxVU4OIFHWXBovyTT2LaBTyC20=
 github.com/looplab/fsm v0.1.0/go.mod h1:m2VaOfDHxqXBBMgc26m6yUOwkFn8H2AlJDE+jd/uafI=
@ -82,9 +75,7 @@ github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/gomega v1.4.3 h1:RE1xgDvH7imwFD45h+u2SgIfERHlS2yNG4DObb5BSKU=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@ -119,6 +110,7 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE=
@ -131,6 +123,10 @@ github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
 go.dedis.ch/fixbuf v1.0.3 h1:hGcV9Cd/znUxlusJ64eAlExS+5cJDIyTyEG+otu5wQs=
 go.dedis.ch/fixbuf v1.0.3/go.mod h1:yzJMt34Wa5xD37V5RTdmp38cz3QhMagdGoem9anUalw=
+go.dedis.ch/kyber/v3 v3.0.4/go.mod h1:OzvaEnPvKlyrWyp3kGXlFdp7ap1VC6RkZDTaPikqhsQ=
+go.dedis.ch/kyber/v3 v3.0.9/go.mod h1:rhNjUUg6ahf8HEg5HUvVBYoWY4boAafX8tYxX+PS+qg=
+go.dedis.ch/protobuf v1.0.5/go.mod h1:eIV4wicvi6JK0q/QnfIEGeSFNG0ZeB24kzut5+HaRLo=
+go.dedis.ch/protobuf v1.0.7/go.mod h1:pv5ysfkDX/EawiPqcW3ikOxsL5t+BqnV6xHSmE79KI4=
 go.dedis.ch/protobuf v1.0.11 h1:FTYVIEzY/bfl37lu3pR4lIj+F9Vp1jE8oh91VmxKgLo=
 go.dedis.ch/protobuf v1.0.11/go.mod h1:97QR256dnkimeNdfmURz0wAMNVbd1VmLXhG1CrTYrJ4=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
@ -139,35 +135,31 @@ go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/
 go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 gocv.io/x/gocv v0.23.0 h1:3Fgbt06/uR8Zf9emWndhjbUjdrw+nto69R/b4noFydY=
 gocv.io/x/gocv v0.23.0/go.mod h1:Rar2PS6DV+T4FL+PM535EImD/h13hGVaHhnCu1xarBs=
-golang.org/x/image v0.0.0-20200618115811-c13761719519 h1:1e2ufUJNM3lCHEY5jIgac/7UTjd6cgJNdatjPdFWf34=
-golang.org/x/image v0.0.0-20200618115811-c13761719519/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+gocv.io/x/gocv v0.24.0 h1:xtm5AnFNUtFvSmU+R/CgX7FguL7EDGEubhDdviX2rPY=
+gocv.io/x/gocv v0.24.0/go.mod h1:Rar2PS6DV+T4FL+PM535EImD/h13hGVaHhnCu1xarBs=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180906233101-161cd47e91fd h1:nTDtHvHSdCn1m6ITfMRqtOd/9+7a3s8RBNOZ3eYZzJA=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190311183353-d8887717615a h1:oWX7TPOiFAMXLq8o0ikBYfCJVlRHBcsciT5bXOrH628=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190522155817-f3200d17e092 h1:4QSRKanuywn15aTZvI/mIDEgPQpswuFndXpOj3rKEco=
 golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f h1:wMNYb4v58l5UBM7MYRLPG6ZhfOqbKu7X5eyFl8ZhKvA=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190124100055-b90733256f2e h1:3GIlrlVLfkoipSReOMNAgApI0ajnalyLa/EZHHca/XI=
 golang.org/x/sys v0.0.0-20190124100055-b90733256f2e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20191025090151-53bf42e6b339/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980 h1:OjiUf46hAmXblsZdnoSXsEUSKU8r1UEzcL5RVZ4gO9Y=
+golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@ -184,20 +176,16 @@ google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoA
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
-gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
--- a/main.go
+++ b/main.go
@ -7,29 +7,19 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
-	sif "github.com/depools/dc4bc/fsm/state_machines/signing_proposal_fsm"
 	_ "image/jpeg"
 	"log"
 	"sync"
 	"time"

 	"github.com/depools/dc4bc/airgapped"
-
+	"github.com/depools/dc4bc/client"
 	spf "github.com/depools/dc4bc/fsm/state_machines/signature_proposal_fsm"
+	sif "github.com/depools/dc4bc/fsm/state_machines/signing_proposal_fsm"
 	"github.com/depools/dc4bc/fsm/types/requests"
-	"github.com/google/uuid"
-
 	"github.com/depools/dc4bc/qr"
 	"github.com/depools/dc4bc/storage"
-
-	"github.com/depools/dc4bc/client"
-
-	_ "image/gif"
-	_ "image/png"
-
-	_ "golang.org/x/image/bmp"
-	_ "golang.org/x/image/tiff"
-	_ "golang.org/x/image/webp"
+	"github.com/google/uuid"
 )

 type Transport struct {
--- a/mocks/clientMocks/keystore_mock.go
+++ b/mocks/clientMocks/keystore_mock.go
@ -33,8 +33,18 @@ func (m *MockKeyStore) EXPECT() *MockKeyStoreMockRecorder {
 	return m.recorder
 }

-func (mr *MockKeyStore) PutKeys(userName string, keyPair *client.KeyPair) error {
-	return nil
+// PutKeys mocks base method
+func (m *MockKeyStore) PutKeys(username string, keyPair *client.KeyPair) error {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "PutKeys", username, keyPair)
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+// PutKeys indicates an expected call of PutKeys
+func (mr *MockKeyStoreMockRecorder) PutKeys(username, keyPair interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PutKeys", reflect.TypeOf((*MockKeyStore)(nil).PutKeys), username, keyPair)
 }

 // LoadKeys mocks base method
--- a/mocks/clientMocks/state_mock.go
+++ b/mocks/clientMocks/state_mock.go
@ -5,7 +5,7 @@
 package clientMocks

 import (
-	client "github.com/depools/dc4bc/client"
+	types "github.com/depools/dc4bc/client/types"
 	state_machines "github.com/depools/dc4bc/fsm/state_machines"
 	gomock "github.com/golang/mock/gomock"
 	reflect "reflect"
@ -94,7 +94,7 @@ func (mr *MockStateMockRecorder) LoadFSM(dkgRoundID interface{}) *gomock.Call {
 }

 // PutOperation mocks base method
-func (m *MockState) PutOperation(operation *client.Operation) error {
+func (m *MockState) PutOperation(operation *types.Operation) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "PutOperation", operation)
 	ret0, _ := ret[0].(error)
@ -122,10 +122,10 @@ func (mr *MockStateMockRecorder) DeleteOperation(operationID interface{}) *gomoc
 }

 // GetOperations mocks base method
-func (m *MockState) GetOperations() (map[string]*client.Operation, error) {
+func (m *MockState) GetOperations() (map[string]*types.Operation, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetOperations")
-	ret0, _ := ret[0].(map[string]*client.Operation)
+	ret0, _ := ret[0].(map[string]*types.Operation)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@ -137,10 +137,10 @@ func (mr *MockStateMockRecorder) GetOperations() *gomock.Call {
 }

 // GetOperationByID mocks base method
-func (m *MockState) GetOperationByID(operationID string) (*client.Operation, error) {
+func (m *MockState) GetOperationByID(operationID string) (*types.Operation, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetOperationByID", operationID)
-	ret0, _ := ret[0].(*client.Operation)
+	ret0, _ := ret[0].(*types.Operation)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
--- a/qr/qr.go
+++ b/qr/qr.go
@ -6,11 +6,12 @@ import (
 	"log"
 	"time"

+	"gocv.io/x/gocv"
+
 	encoder "github.com/skip2/go-qrcode"

 	"github.com/makiuchi-d/gozxing"
 	"github.com/makiuchi-d/gozxing/qrcode"
-	"gocv.io/x/gocv"
 )

 const (