Merge pull request #16 from hyle-team/dev/submit-endpoint-update

Dev/submit-endpoint-update

Author: slbmax

cmd/README.md

@@ -1,7 +1,8 @@
 # /cmd
 
 ## Description
-Contains the command-line interface (CLI) for the project
+Contains the command-line interface (CLI) for the project. 
+Command-line interface for project is designed to help user to prepare and then run the service.
 
 ## Components
 - `root.go`: Contains the main entry point for the CLI
@@ -12,6 +13,7 @@ Contains the command-line interface (CLI) for the project
 Some of the commands require the mandatory or optional flags to be passed. See the [Flags](#flags) section for more details about specific flag definition and usage.
 
 ### Database Migrations
+At the start of server user has to migrate up his db to have possibility to process deposits in right way.
 Commands:
 - `tss-svc service migrate up`: Migrates the database schema to the latest version
 - `tss-svc service migrate down`: Rolls back the database schema to the previous version
@@ -20,6 +22,10 @@ Required flags:
 - `--config` (can be omitted if the default config file path is used)
 
 ### Run server
+Service can be run into two modes: keygen and signing.
+- Signing mode offers user to take part in signing sessions and proceed incoming deposits.
+- Keygen mode is designed to generate user`s shares used in signing process.
+
 Commands:
 - `tss-svc service run keygen`: Runs the TSS service in the keygen mode
 - `tss-svc service run signing`: Runs the TSS service in the sign mode
@@ -54,6 +60,15 @@ Optional flags:
 - `tss-svc helpers generate transaction`: Generates a new transaction based on the given data. 
     It is used for resharing purposes. Should be investigated further. 
 
+### Parsing
+Commands:
+- `tss-svc helpers parse address-btc [x-cord] [y-cord]`: Parses btc address from given point 
+- `tss-svc helpers parse address-eth [x-cord] [y-cord]`: Parses eth address from given point
+- `tss-svc helpers parse pubkey [x-cord] [y-cord]`: Parses public key from given point
+
+Optional flags:
+  - `--network` (Network type (mainnet/testnet), mainnet is used by default)
+
 ## Flags
 - `--config` (`-c`): Specifies the path to the configuration file. By default, the config file path is set to `config.yaml`. See [Configuration](../docs/04_configuration.md) for more details
 - `--output` (`-o`): Specifies the data output type for the command.

cmd/service/run/sign.go

@@ -79,6 +79,7 @@ func runSigningService(ctx context.Context, cfg config.Config, wg *sync.WaitGrou
 		fetcher,
 		p2p.NewBroadcaster(cfg.Parties()),
 		account.CosmosAddress(),
+		connector,
 	)
 
 	// API servers spin-up
@@ -172,7 +173,6 @@ func runSigningService(ctx context.Context, cfg config.Config, wg *sync.WaitGrou
 		depositAcceptorSession := bridge.NewDepositAcceptorSession(
 			cfg.Parties(),
 			fetcher,
-			clientsRepo,
 			db,
 			logger.WithField("component", "deposit_acceptor_session"),
 		)

internal/api/common/common.go

@@ -3,6 +3,7 @@ package common
 import (
 	validation "github.com/go-ozzo/ozzo-validation/v4"
 	apiTypes "github.com/hyle-team/tss-svc/internal/api/types"
+	"github.com/hyle-team/tss-svc/internal/bridge/chains"
 	"github.com/hyle-team/tss-svc/internal/bridge/clients"
 	database "github.com/hyle-team/tss-svc/internal/db"
 	"github.com/hyle-team/tss-svc/internal/types"
@@ -24,6 +25,11 @@ func ValidateIdentifier(identifier *types.DepositIdentifier, client clients.Clie
 		return errors.New("invalid transaction hash")
 	}
 
+	// If chain type is Zano event index always is 0
+	if client.Type() == chains.TypeZano {
+		identifier.TxNonce = 0
+	}
+	
 	return nil
 }
 
@@ -43,20 +49,20 @@ func ToStatusResponse(d *database.Deposit) *apiTypes.CheckWithdrawalResponse {
 
 	result.TransferData = &types.TransferData{
 		Sender:           d.Depositor,
-		Receiver:         *d.Receiver,
-		DepositAmount:    *d.DepositAmount,
-		WithdrawalAmount: *d.WithdrawalAmount,
-		DepositAsset:     *d.DepositToken,
-		WithdrawalAsset:  *d.WithdrawalToken,
-		IsWrappedAsset:   *d.IsWrappedToken,
-		DepositBlock:     *d.DepositBlock,
+		Receiver:         d.Receiver,
+		DepositAmount:    d.DepositAmount,
+		WithdrawalAmount: d.WithdrawalAmount,
+		DepositAsset:     d.DepositToken,
+		WithdrawalAsset:  d.WithdrawalToken,
+		IsWrappedAsset:   d.IsWrappedToken,
+		DepositBlock:     d.DepositBlock,
 		Signature:        d.Signature,
 	}
 
 	if d.WithdrawalTxHash != nil {
 		result.WithdrawalIdentifier = &types.WithdrawalIdentifier{
 			TxHash:  *d.WithdrawalTxHash,
-			ChainId: *d.WithdrawalChainId,
+			ChainId: d.WithdrawalChainId,
 		}
 	}
 

internal/api/ctx/ctx.go

@@ -2,6 +2,7 @@ package ctx
 
 import (
 	"context"
+	coreConnector "github.com/hyle-team/tss-svc/internal/core/connector"
 
 	"github.com/hyle-team/tss-svc/internal/bridge"
 	bridgeTypes "github.com/hyle-team/tss-svc/internal/bridge/clients"
@@ -14,12 +15,13 @@ import (
 type ctxKey int
 
 const (
-	dbKey          ctxKey = iota
-	loggerKey      ctxKey = iota
-	clientsKey     ctxKey = iota
-	processorKey   ctxKey = iota
-	broadcasterKey ctxKey = iota
-	selfKey        ctxKey = iota
+	dbKey            ctxKey = iota
+	loggerKey        ctxKey = iota
+	clientsKey       ctxKey = iota
+	processorKey     ctxKey = iota
+	broadcasterKey   ctxKey = iota
+	selfKey          ctxKey = iota
+	coreConnectorKey ctxKey = iota
 )
 
 func DBProvider(q db.DepositsQ) func(context.Context) context.Context {
@@ -84,3 +86,11 @@ func SelfProvider(self core.Address) func(context.Context) context.Context {
 func Self(ctx context.Context) core.Address {
 	return ctx.Value(selfKey).(core.Address)
 }
+
+func CoreConnectorProvider(connector *coreConnector.Connector) func(context.Context) context.Context {
+	return func(ctx context.Context) context.Context { return context.WithValue(ctx, coreConnectorKey, connector) }
+}
+
+func CoreConnector(ctx context.Context) *coreConnector.Connector {
+	return ctx.Value(coreConnectorKey).(*coreConnector.Connector)
+}

internal/api/grpc/submit_withdraw.go

@@ -2,7 +2,6 @@ package grpc
 
 import (
 	"context"
-
 	"github.com/hyle-team/tss-svc/internal/api/common"
 	"github.com/hyle-team/tss-svc/internal/api/ctx"
 	"github.com/hyle-team/tss-svc/internal/bridge"
@@ -22,10 +21,11 @@ func (Implementation) SubmitWithdrawal(ctxt context.Context, identifier *types.D
 	}
 
 	var (
-		clientsRepo = ctx.Clients(ctxt)
-		data        = ctx.DB(ctxt)
-		logger      = ctx.Logger(ctxt)
-		processor   = ctx.Fetcher(ctxt)
+		clientsRepo   = ctx.Clients(ctxt)
+		data          = ctx.DB(ctxt)
+		logger        = ctx.Logger(ctxt)
+		processor     = ctx.Fetcher(ctxt)
+		coreConnector = ctx.CoreConnector(ctxt)
 	)
 
 	client, err := clientsRepo.Client(identifier.ChainId)
@@ -36,12 +36,12 @@ func (Implementation) SubmitWithdrawal(ctxt context.Context, identifier *types.D
 		return nil, status.Error(codes.InvalidArgument, err.Error())
 	}
 
-	exists, err := data.Exists(db.ToExistenceCheck(identifier, client.Type()))
+	d, err := coreConnector.GetDepositInfo(identifier)
 	if err != nil {
-		logger.WithError(err).Error("failed to check if deposit exists")
+		logger.WithError(err).Error("error checking deposit info on core")
 		return nil, ErrInternal
 	}
-	if exists {
+	if d != nil {
 		return nil, ErrTxAlreadySubmitted
 	}
 
@@ -51,13 +51,30 @@ func (Implementation) SubmitWithdrawal(ctxt context.Context, identifier *types.D
 		TxNonce: int(identifier.TxNonce),
 	}
 
-	deposit, err := processor.FetchDeposit(id)
+	deposit, err := data.Get(id)
+	if err != nil {
+		logger.WithError(err).Error("error getting deposit")
+		return nil, ErrInternal
+	}
+	if deposit != nil {
+		return nil, status.Error(codes.AlreadyExists, "deposit already exists")
+	}
+
+	deposit, err = processor.FetchDeposit(id)
 	if err != nil {
 		if clients.IsPendingDepositError(err) {
 			return nil, ErrDepositPending
 		}
 		if clients.IsInvalidDepositError(err) {
-			// TODO: insert in db
+			deposit = &db.Deposit{
+				DepositIdentifier: id,
+				WithdrawalStatus:  types.WithdrawalStatus_WITHDRAWAL_STATUS_INVALID,
+			}
+			if _, err = data.Insert(*deposit); err != nil {
+				logger.WithError(err).Error("failed to process deposit")
+				return nil, ErrInternal
+			}
+
 			return nil, status.Error(codes.InvalidArgument, "invalid deposit")
 		}
 

internal/api/server.go

@@ -2,6 +2,7 @@ package api
 
 import (
 	"context"
+	coreConnector "github.com/hyle-team/tss-svc/internal/core/connector"
 	"net"
 	"net/http"
 	"time"
@@ -46,6 +47,7 @@ func NewServer(
 	processor *bridge.DepositFetcher,
 	broadcaster *p2p.Broadcaster,
 	self core.Address,
+	connector *coreConnector.Connector,
 ) *Server {
 	return &Server{
 		grpc:   grpc,
@@ -59,6 +61,7 @@ func NewServer(
 			ctx.FetcherProvider(processor),
 			ctx.BroadcasterProvider(broadcaster),
 			ctx.SelfProvider(self),
+			ctx.CoreConnectorProvider(connector),
 		},
 	}
 }

internal/bridge/README.md

@@ -71,7 +71,7 @@ Signing data validation: using the provided deposit data and the signing data, t
 
 ### Zano network
 Signing data construction: according to the provided deposit data, the [`emit_asset`](https://docs.zano.org/docs/build/rpc-api/wallet-rpc-api/emit_asset/) request is sent to the Zano wallet RPC server, and the resulting `VerifiedTxID` field is a ready-to-sign data.
-  
+
 Signing data validation: using the provided deposit data and provided additional data from the `emit_asset` response by the proposer, the constructor has the ability to decrypt transaction details using [`decrypt_tx_details`](https://docs.zano.org/docs/build/rpc-api/daemon-rpc-api/decrypt_tx_details) method. 
 Constructor validates:
   - if the provided `VerifiedTxID` matches the `decrypt_tx_details` response;

internal/bridge/acceptor_session.go

@@ -4,10 +4,11 @@ import (
 	"context"
 	"fmt"
 
-	bridgeTypes "github.com/hyle-team/tss-svc/internal/bridge/clients"
+	"github.com/hyle-team/tss-svc/internal/bridge/clients"
 	"github.com/hyle-team/tss-svc/internal/core"
 	"github.com/hyle-team/tss-svc/internal/db"
 	"github.com/hyle-team/tss-svc/internal/p2p"
+
 	"github.com/hyle-team/tss-svc/internal/types"
 	"github.com/pkg/errors"
 	"gitlab.com/distributed_lab/logan/v3"
@@ -28,7 +29,6 @@ type DepositAcceptorSession struct {
 	fetcher *DepositFetcher
 	data    db.DepositsQ
 	logger  *logan.Entry
-	clients bridgeTypes.Repository
 
 	distributors map[core.Address]struct{}
 
@@ -38,7 +38,6 @@ type DepositAcceptorSession struct {
 func NewDepositAcceptorSession(
 	distributors []p2p.Party,
 	fetcher *DepositFetcher,
-	clients bridgeTypes.Repository,
 	data db.DepositsQ,
 	logger *logan.Entry,
 ) *DepositAcceptorSession {
@@ -52,7 +51,6 @@ func NewDepositAcceptorSession(
 		msgs:         make(chan distributedDeposit, 100),
 		data:         data,
 		logger:       logger,
-		clients:      clients,
 		distributors: distributorsMap,
 	}
 }
@@ -68,27 +66,43 @@ func (d *DepositAcceptorSession) Run(ctx context.Context) {
 		case msg := <-d.msgs:
 			d.logger.Info(fmt.Sprintf("received deposit from %s", msg.Distributor))
 
-			client, err := d.clients.Client(msg.Identifier.ChainId)
-			if err != nil {
-				d.logger.Error("got unsupported chain identifier")
-				continue
+			id := db.DepositIdentifier{
+				ChainId: msg.Identifier.ChainId,
+				TxHash:  msg.Identifier.TxHash,
+				TxNonce: int(msg.Identifier.TxNonce),
 			}
 
-			if exists, err := d.data.Exists(db.ToExistenceCheck(msg.Identifier, client.Type())); err != nil {
+			deposit, err := d.data.Get(db.DepositIdentifier{
+				TxHash:  msg.Identifier.TxHash,
+				TxNonce: int(msg.Identifier.TxNonce),
+				ChainId: msg.Identifier.ChainId,
+			})
+			if err != nil {
 				d.logger.WithError(err).Error("failed to check if deposit exists")
 				continue
-			} else if exists {
-				d.logger.Info("deposit already exists")
+			} else if deposit != nil {
+				d.logger.Warn("deposit already exists")
 				continue
 			}
 
-			deposit, err := d.fetcher.FetchDeposit(db.DepositIdentifier{
-				ChainId: msg.Identifier.ChainId,
-				TxHash:  msg.Identifier.TxHash,
-				TxNonce: int(msg.Identifier.TxNonce),
-			})
+			deposit, err = d.fetcher.FetchDeposit(id)
 			if err != nil {
-				// TODO: checkout err type
+				if clients.IsPendingDepositError(err) {
+					d.logger.Warn("deposit still pending")
+					continue
+				}
+				if clients.IsInvalidDepositError(err) {
+					deposit = &db.Deposit{
+						DepositIdentifier: id,
+						WithdrawalStatus:  types.WithdrawalStatus_WITHDRAWAL_STATUS_INVALID,
+					}
+					if _, err = d.data.Insert(*deposit); err != nil {
+						d.logger.WithError(err).Error("failed to process deposit")
+						continue
+					}
+					d.logger.Warn("invalid deposit")
+					continue
+				}
 				d.logger.WithError(err).Error("failed to fetch deposit")
 				continue
 			}

internal/bridge/clients/bitcoin/withdraw.go

@@ -20,11 +20,11 @@ const (
 )
 
 func (c *Client) CreateUnsignedWithdrawalTx(deposit db.Deposit, changeAddr string) (*wire.MsgTx, [][]byte, error) {
-	amount, set := new(big.Int).SetString(*deposit.WithdrawalAmount, 10)
+	amount, set := new(big.Int).SetString(deposit.WithdrawalAmount, 10)
 	if !set {
 		return nil, nil, errors.New("failed to parse amount")
 	}
-	receiverAddr, err := btcutil.DecodeAddress(*deposit.Receiver, c.chain.Params)
+	receiverAddr, err := btcutil.DecodeAddress(deposit.Receiver, c.chain.Params)
 	if err != nil {
 		return nil, nil, errors.Wrap(err, "failed to decode receiver address")
 	}

internal/bridge/clients/evm/operations/erc20.go

@@ -22,28 +22,28 @@ type WithdrawERC20Content struct {
 }
 
 func NewWithdrawERC20Content(data db.Deposit) (*WithdrawERC20Content, error) {
-	destinationChainID, ok := new(big.Int).SetString(*data.WithdrawalChainId, 10)
+	destinationChainID, ok := new(big.Int).SetString(data.WithdrawalChainId, 10)
 	if !ok {
 		return nil, errors.New("invalid chains id")
 	}
 
-	withdrawalAmount, ok := new(big.Int).SetString(*data.WithdrawalAmount, 10)
+	withdrawalAmount, ok := new(big.Int).SetString(data.WithdrawalAmount, 10)
 	if !ok {
 		return nil, errors.New("invalid withdrawal amount")
 	}
 
-	if !common.IsHexAddress(*data.Receiver) {
+	if !common.IsHexAddress(data.Receiver) {
 		return nil, errors.New("invalid destination address")
 	}
 
 	return &WithdrawERC20Content{
 		Amount:                  ToBytes32(withdrawalAmount.Bytes()),
-		Receiver:                hexutil.MustDecode(*data.Receiver),
+		Receiver:                hexutil.MustDecode(data.Receiver),
 		TxHash:                  hexutil.MustDecode(data.TxHash),
 		TxNonce:                 IntToBytes32(data.TxNonce),
 		ChainID:                 ToBytes32(destinationChainID.Bytes()),
-		DestinationTokenAddress: common.HexToAddress(*data.WithdrawalToken).Bytes(),
-		IsWrapped:               BoolToBytes(*data.IsWrappedToken),
+		DestinationTokenAddress: common.HexToAddress(data.WithdrawalToken).Bytes(),
+		IsWrapped:               BoolToBytes(data.IsWrappedToken),
 	}, nil
 }