Added product fee to the quote

connectors/rsk.go

@@ -124,6 +124,7 @@ type RSKConnector interface {
 	GetPegoutCollateral(addr string) (*big.Int, *big.Int, error)
 	AddPegoutCollateral(opts *bind.TransactOpts) error
 	GetTransactionReceipt(txHash string) (*gethTypes.Receipt, error)
+	GetDaoFeePercentage() (uint64, error)
 }
 
 type RSKClient interface {
@@ -935,6 +936,7 @@ func (rsk *RSK) ParseQuote(q *pegin.Quote) (bindings.QuotesPeginQuote, error) {
 	pq.CallTime = q.LpCallTime
 	pq.DepositConfirmations = q.Confirmations
 	pq.TimeForDeposit = q.TimeForDeposit
+	pq.ProductFeeAmount = big.NewInt(int64(q.ProductFeeAmount))
 	return pq, nil
 }
 
@@ -980,6 +982,7 @@ func (rsk *RSK) ParsePegOutQuote(q *pegout.Quote) (bindings.QuotesPegOutQuote, e
 	pq.TransferTime = q.TransferTime
 	pq.ExpireDate = q.ExpireDate
 	pq.ExpireBlock = q.ExpireBlock
+	pq.ProductFeeAmount = types.NewWei(int64(q.ProductFeeAmount)).AsBigInt()
 
 	return pq, nil
 }
@@ -1279,3 +1282,14 @@ func (rsk *RSK) awaitTx(function func() (*gethTypes.Transaction, error)) (*gethT
 	}
 	return nil, err
 }
+
+func (rsk *RSK) GetDaoFeePercentage() (uint64, error) {
+	opts := bind.CallOpts{}
+	amount, err := rsk.lbc.ProductFeePercentage(&opts)
+
+	if err != nil {
+		return 0, err
+	}
+
+	return amount.Uint64(), nil
+}

docker-compose/local/.env.regtest

@@ -41,20 +41,24 @@ KEY_DIR=geth_keystore
 ACCOUNT_NUM=0
 PWD_FILE=pwd.txt
 CHAIN_ID=33
+
 KEY_SECRET=FlyoverTestEnv/LPS-LOCAL-KEY
 PASSWORD_SECRET=FlyoverTestEnv/LPS-LOCAL-PASSWORD
 BTC_WALLET_PASSWORD=FlyoverTestEnv/LPS-LOCAL-BTC-WALLET-PASSWORD
 BTC_ENCRYPTED_WALLET=true
 
-AWS_ACCESS_KEY_ID=
-AWS_SECRET_ACCESS_KEY=
-AWS_REGION=
+[email protected]
+MAILGUN_DOMAIN=b30c8b203ade9013f16fbd24232f7580-102c75d8-2e73f63d
+
+AWS_ACCESS_KEY_ID=AKIARRR3WWCRU722UAHK
+AWS_SECRET_ACCESS_KEY=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
+AWS_REGION=us-east-1
 
 ENCRYPT_APP_KEY=FlyoverTestEnv/ENCRYPT-KEY
 # From previous .env
-LIQUIDITY_PROVIDER_RSK_ADDR=0x9D93929A9099be4355fC2389FbF253982F9dF47c
-PEGIN_LIQUIDITY_PROVIDER_RSK_ADDR=
-PEGOUT_LIQUIDITY_PROVIDER_RSK_ADDR=
+LIQUIDITY_PROVIDER_RSK_ADDR=0x9d93929a9099be4355fc2389fbf253982f9df47c
+PEGIN_LIQUIDITY_PROVIDER_RSK_ADDR=0x9d93929a9099be4355fc2389fbf253982f9df47c
+PEGOUT_LIQUIDITY_PROVIDER_RSK_ADDR=0x9d93929a9099be4355fc2389fbf253982f9df47c
 
 BTCD_RPC_USER=test
 BTCD_RPC_PASS=test
@@ -85,5 +89,5 @@ QUOTE_CACHE_START_BLOCK=0
 CAPTCHA_SECRET_KEY=
 CAPTCHA_SITE_KEY=
 CAPTCHA_THRESHOLD=0.8
-DISABLE_CAPTCHA=false
+DISABLE_CAPTCHA=true
 PROVIDER_TYPE=both

docker-compose/local/OpenAPI.yml

@@ -148,6 +148,9 @@ components:
           description: The penalty fee that the LP pays if it fails to deliver the
             service
           type: integer
+        productFeeAmount:
+          description: The DAO Fee amount
+          type: integer
         rskRefundAddr:
           description: A User RSK refund address
           type: string
@@ -178,6 +181,7 @@ components:
       - confirmations
       - callOnRegister
       - callCost
+      - productFeeAmount
       type: object
     PegoutQuoteDTO:
       properties:
@@ -211,6 +215,9 @@ components:
           type: integer
         penaltyFee:
           type: integer
+        productFeeAmount:
+          description: The DAO fee amount
+          type: integer
         rskRefundAddress:
           type: string
         transferConfirmations:
@@ -238,6 +245,7 @@ components:
       - expireDate
       - expireBlocks
       - callCost
+      - productFeeAmount
       type: object
     ProviderDTO:
       properties:

http/dto.go

@@ -57,6 +57,7 @@ type PeginQuoteDTO struct {
 	Confirmations      uint16 `json:"confirmations" required:"" description:"The number of confirmations that the LP requires before making the call"`
 	CallOnRegister     bool   `json:"callOnRegister" required:"" description:"A boolean value indicating whether the callForUser can be called on registerPegIn"`
 	CallCost           uint64 `json:"callCost" required:"" description:"The estimated cost for the LP to do the call on behalf of the user. Is calculated with gasPrice * gasLimit"`
+	ProductFeeAmount   uint64 `json:"productFeeAmount" required:"" description:"The DAO Fee amount"`
 }
 
 func toPeginQuote(quote *pegin.Quote) *PeginQuoteDTO {
@@ -80,6 +81,7 @@ func toPeginQuote(quote *pegin.Quote) *PeginQuoteDTO {
 		Confirmations:      quote.Confirmations,
 		CallOnRegister:     quote.CallOnRegister,
 		CallCost:           quote.CallCost.Uint64(),
+		ProductFeeAmount:   quote.ProductFeeAmount,
 	}
 }
 
@@ -102,6 +104,7 @@ type PegoutQuoteDTO struct {
 	ExpireDate            uint32 `json:"expireDate" required:"" validate:"required"`
 	ExpireBlock           uint32 `json:"expireBlocks" required:"" validate:"required"`
 	CallCost              uint64 `json:"callCost" required:"" description:"The estimated cost for the LP to do the transaction on behalf of the user in Bitcoin network"`
+	ProductFeeAmount      uint64 `json:"productFeeAmount" required:"" description:"The DAO fee amount"`
 }
 
 func toPegoutQuote(quote *pegout.Quote) *PegoutQuoteDTO {
@@ -124,5 +127,6 @@ func toPegoutQuote(quote *pegout.Quote) *PegoutQuoteDTO {
 		ExpireDate:            quote.ExpireDate,
 		ExpireBlock:           quote.ExpireBlock,
 		CallCost:              quote.CallCost.Uint64(),
+		ProductFeeAmount:      quote.ProductFeeAmount,
 	}
 }

http/server.go

@@ -74,6 +74,7 @@ const GetCollateralError = "Unable to get collateral"
 const ErrorAddingProvider = "Error Adding New provider: %v"
 const ErrorRetrivingProviderAddress = "Error Retrieving Provider Address from MongoDB"
 const ErrorNotLiquidity = "Not enough liquidity"
+const ErrorRetrievingDaoFeePercentage = "Error retrieving dao fee percentage"
 
 type LiquidityProviderList struct {
 	Endpoint                    string   `env:"RSK_ENDPOINT"`
@@ -830,14 +831,12 @@ func (s *Server) getQuoteHandler(w http.ResponseWriter, r *http.Request) {
 
 	var gas uint64
 	gas, err = s.rsk.EstimateGas(qr.CallEoaOrContractAddress, big.NewInt(int64(qr.ValueToTransfer)), []byte(qr.CallContractArguments))
-
 	if err != nil {
 		log.Error(ErrorEstimatingGas, err.Error())
 		customError := NewServerError(ErrorEstimatingGas, make(Details), true)
 		ResponseError(w, customError, http.StatusInternalServerError)
 		return
 	}
-
 	price, err := s.rsk.GasPrice()
 	if err != nil {
 		log.Error(ErrorEstimatingGas, err.Error())
@@ -864,9 +863,20 @@ func (s *Server) getQuoteHandler(w http.ResponseWriter, r *http.Request) {
 	}
 	minLockTxValueInWei := types.SatoshiToWei(minLockTxValueInSatoshi.Uint64())
 
+	daoFeePercentage, err := s.rsk.GetDaoFeePercentage()
+
+	if err != nil {
+		log.Error(ErrorRetrievingDaoFeePercentage, err.Error())
+		customError := NewServerError(ErrorRetrievingDaoFeePercentage, make(map[string]interface{}), true)
+		ResponseError(w, customError, http.StatusInternalServerError)
+		return
+	}
+
+	daoFeeAmount := qr.ValueToTransfer * daoFeePercentage / 100
+
 	getQuoteFailed := false
 	amountBelowMinLockTxValue := false
-	q := parseReqToQuote(qr, s.rsk.GetLBCAddress(), fedAddress, gas)
+	q := parseReqToQuote(qr, s.rsk.GetLBCAddress(), fedAddress, gas, daoFeeAmount)
 	pq, err := s.provider.GetQuote(q, gas, types.NewBigWei(price))
 	if err != nil {
 		log.Error("error getting quote: ", err)
@@ -879,7 +889,6 @@ func (s *Server) getQuoteHandler(w http.ResponseWriter, r *http.Request) {
 		}
 
 		hash, err := s.storeQuote(pq)
-
 		if err != nil {
 			log.Error(err)
 			errmsg := ErrorStoringProviderQuote + ": " + err.Error()
@@ -989,7 +998,19 @@ func (s *Server) getPegoutQuoteHandler(w http.ResponseWriter, r *http.Request) {
 
 	getQuoteFailed := false
 	amountBelowMinLockTxValue := false
-	q := parseReqToPegOutQuote(qr, s.rsk.GetLBCAddress())
+
+	daoFeePercentage, err := s.rsk.GetDaoFeePercentage()
+
+	if err != nil {
+		log.Error(ErrorRetrievingDaoFeePercentage, err.Error())
+		customError := NewServerError(ErrorRetrievingDaoFeePercentage, make(map[string]interface{}), true)
+		ResponseError(w, customError, http.StatusInternalServerError)
+		return
+	}
+
+	daoFeeAmount := qr.ValueToTransfer * daoFeePercentage / 100
+
+	q := parseReqToPegOutQuote(qr, s.rsk.GetLBCAddress(), daoFeeAmount)
 	rskBlockNumber, err := s.rsk.GetRskHeight()
 	if err != nil {
 		log.Error("Error getting last block", err.Error())
@@ -1195,26 +1216,28 @@ func (s *Server) acceptQuoteHandler(w http.ResponseWriter, r *http.Request) {
 	returnQuoteSignFunc(w, signature, depositAddress)
 }
 
-func parseReqToQuote(qr QuoteRequest, lbcAddr string, fedAddr string, limitGas uint64) *pegin.Quote {
+func parseReqToQuote(qr QuoteRequest, lbcAddr string, fedAddr string, limitGas uint64, daoFeeAmount uint64) *pegin.Quote {
 	return &pegin.Quote{
-		LBCAddr:       lbcAddr,
-		FedBTCAddr:    fedAddr,
-		BTCRefundAddr: qr.BitcoinRefundAddress,
-		RSKRefundAddr: qr.RskRefundAddress,
-		ContractAddr:  qr.CallEoaOrContractAddress,
-		Data:          qr.CallContractArguments,
-		Value:         types.NewWei(int64(qr.ValueToTransfer)),
-		GasLimit:      uint32(limitGas),
+		LBCAddr:          lbcAddr,
+		FedBTCAddr:       fedAddr,
+		BTCRefundAddr:    qr.BitcoinRefundAddress,
+		RSKRefundAddr:    qr.RskRefundAddress,
+		ContractAddr:     qr.CallEoaOrContractAddress,
+		Data:             qr.CallContractArguments,
+		Value:            types.NewWei(int64(qr.ValueToTransfer)),
+		GasLimit:         uint32(limitGas),
+		ProductFeeAmount: daoFeeAmount,
 	}
 }
 
-func parseReqToPegOutQuote(qr QuotePegOutRequest, lbcAddr string) *pegout.Quote {
+func parseReqToPegOutQuote(qr QuotePegOutRequest, lbcAddr string, productFeeAmount uint64) *pegout.Quote {
 	return &pegout.Quote{
-		LBCAddr:       lbcAddr,
-		BtcRefundAddr: qr.BitcoinRefundAddress,
-		RSKRefundAddr: qr.RskRefundAddress,
-		DepositAddr:   qr.To,
-		Value:         types.NewWei(int64(qr.ValueToTransfer)),
+		LBCAddr:          lbcAddr,
+		BtcRefundAddr:    qr.BitcoinRefundAddress,
+		RSKRefundAddr:    qr.RskRefundAddress,
+		DepositAddr:      qr.To,
+		Value:            types.NewWei(int64(qr.ValueToTransfer)),
+		ProductFeeAmount: productFeeAmount,
 	}
 }
 
@@ -1260,6 +1283,7 @@ func getPegOutProviderByAddress(liquidityProviders []pegout.LiquidityProvider, a
 }
 
 func (s *Server) storeQuote(q *pegin.Quote) (string, error) {
+	log.Debug(q.ProductFeeAmount)
 	h, err := s.rsk.HashQuote(q)
 	if err != nil {
 		return "", err

pegin/quote.go

@@ -26,6 +26,7 @@ type Quote struct {
 	Confirmations      uint16     `json:"confirmations" db:"confirmations"`
 	CallOnRegister     bool       `json:"callOnRegister" db:"call_on_register"`
 	CallCost           *types.Wei `json:"callCost" db:"call_cost"`
+	ProductFeeAmount   uint64     `json:"productFeeAmount" db:"product_fee_amount"`
 }
 
 type PunishmentEvent struct {

pegout/pegout_quote.go

@@ -26,6 +26,7 @@ type Quote struct {
 	ExpireDate            uint32     `json:"expireDate" db:"expire_date" validate:"required"`
 	ExpireBlock           uint32     `json:"expireBlocks" db:"expire_blocks" validate:"required"`
 	CallCost              *types.Wei `json:"callCost" db:"callCost" validate:"required"`
+	ProductFeeAmount      uint64     `json:"productFeeAmount" db:"product_fee_amount" validate:"required"`
 }
 
 func (q *Quote) GetExpirationTime() time.Time {