Revert "merge develop (#14)" (#15)

This reverts commit 92d6e7a.

Makefile

@@ -73,7 +73,7 @@ require-deps: ## Require cli tools for development
 	go install github.com/rubenv/sql-migrate/...@latest
 	go install github.com/kyleconroy/sqlc/cmd/sqlc@latest
 	go install github.com/cespare/reflex@latest
-	go install github.com/vektra/mockery/v2@v2.32.0
+	go install github.com/vektra/mockery/v2@latest
 	go install github.com/golangci/golangci-lint/cmd/[email protected]
     # todo go-swagger as swagger
 

README.md

@@ -5,7 +5,7 @@
 </p>
 
 [OxygenPay](https://o2pay.co) is a cloud or self-hosted crypto payment gateway.
-Receive crypto including stablecoins with ease. Open new opportunities for your product by accepting cryptocurrency.
+Accept ETH, MATIC, TRON, USDT, and USDC with ease. Open new opportunities for your product by accepting cryptocurrency.
 
 <img src="./.github/static/demo.jpg" alt="demo">
 
@@ -25,10 +25,6 @@ Receive crypto including stablecoins with ease. Open new opportunities for your
             <img src="./ui-dashboard/src/assets/icons/crypto/tron.svg" height="64" alt="tron">
             <div>TRON</div>
         </td>
-        <td align="center">
-            <img src="./ui-dashboard/src/assets/icons/crypto/bnb.svg" height="64" alt="bnb">
-            <div>BNB</div>
-        </td>
         <td align="center">
             <img src="./ui-dashboard/src/assets/icons/crypto/usdt.svg" height="64" alt="usdt">
             <div>USDT</div>
@@ -37,10 +33,6 @@ Receive crypto including stablecoins with ease. Open new opportunities for your
             <img src="./ui-dashboard/src/assets/icons/crypto/usdc.svg" height="64" alt="usdc">
             <div>USDC</div>
         </td>
-        <td align="center">
-            <img src="./ui-dashboard/src/assets/icons/crypto/busd.svg" height="64" alt="busd">
-            <div>BUSD</div>
-        </td>
     </tr>
 </table>
 
@@ -60,13 +52,12 @@ Receive crypto including stablecoins with ease. Open new opportunities for your
 
 ## Documentation 📚
 
-Visit [docs.o2pay.co](https://docs.o2pay.co) for setup guides. If you have any questions,
-feel free to ask them in our [telegram community](https://t.me/oxygenpay_en)
+Visit [docs.o2pay.co](https://docs.o2pay.co) for setup guides. If you have any questions, feel free to ask them in our [telegram community](https://t.me/oxygenpay_en)
 
 ## Roadmap 🛣️
 
 - [x] Support for USDC
-- [x] Support for Binance Smart Chain (BNB, BUSD)
+- [ ] Support for Binance Smart Chain (BNB, BUSD)
 - [ ] Donations feature
 - [ ] Support for [WalletConnect](https://walletconnect.com/)
 - [ ] SDKs for (Python, JavaScript, PHP, etc...)

api/proto/kms/kms-v1.yml

@@ -22,9 +22,6 @@ paths:
   /wallet/{walletId}/transaction/matic:
     $ref: './v1/wallet.yml#/paths/~1wallet~1{walletId}~1transaction~1matic'
 
-  /wallet/{walletId}/transaction/bsc:
-    $ref: './v1/wallet.yml#/paths/~1wallet~1{walletId}~1transaction~1bsc'
-
   /wallet/{walletId}/transaction/tron:
     $ref: './v1/wallet.yml#/paths/~1wallet~1{walletId}~1transaction~1tron'
 

api/proto/kms/v1/wallet.yml

@@ -75,8 +75,6 @@ definitions:
 
   CreateMaticTransactionRequest: *createEthTransaction
 
-  CreateBSCTransactionRequest: *createEthTransaction
-
   CreateTronTransactionRequest:
     type: object
     required: [ assetType, recipient, amount ]
@@ -116,7 +114,7 @@ definitions:
   Blockchain:
     type: string
     description: Supported blockchain
-    enum: [ BTC, ETH, TRON, MATIC, BSC ]
+    enum: [ BTC, ETH, TRON, MATIC ]
     x-nullable: false
     x-omitempty: false
 
@@ -149,7 +147,7 @@ definitions:
         description: Created At
         example: 1656696522
 
-  EthereumTransaction: &ethTransaction
+  EthereumTransaction:
     type: object
     properties:
       rawTransaction:
@@ -159,9 +157,15 @@ definitions:
         x-nullable: false
         x-omitempty: false
 
-  MaticTransaction: *ethTransaction
-
-  BSCTransaction: *ethTransaction
+  MaticTransaction:
+    type: object
+    properties:
+      rawTransaction:
+        type: string
+        description: RLP-encoded transaction
+        example: '0xf86e83014b2985048ccb44b1827530944675c7e5baafbffbca748158becba61ef3b0a26387c2a454bcf91b3f8026a0db0be3dcc25213b286e08d018fe8143eb85a3b7bb5cf3749245e907158e9c8daa033c7ec9362ee890d63b89e9dbfcfcb6edd9432321102c1d2ea7921c6cc07009e'
+        x-nullable: false
+        x-omitempty: false
 
   TronTransaction:
     type: object
@@ -288,29 +292,6 @@ paths:
           schema:
             $ref: '../kms-v1.yml#/definitions/ErrorResponse'
 
-  /wallet/{walletId}/transaction/bsc:
-    post:
-      summary: Create BSC Transaction
-      operationId: createBSCTransaction
-      tags: [ Wallet ]
-      parameters:
-        - $ref: '#/parameters/WalletId'
-        - in: body
-          name: data
-          required: true
-          schema:
-            $ref: '#/definitions/CreateBSCTransactionRequest'
-      responses:
-        201:
-          description: Transaction Created
-          schema:
-            $ref: '#/definitions/BSCTransaction'
-        400:
-          description: Validation error / Not found
-          schema:
-            $ref: '../kms-v1.yml#/definitions/ErrorResponse'
-
-
   /wallet/{walletId}/transaction/tron:
     post:
       summary: Create Tron Transaction

api/proto/merchant/v1/merchant_address.yml

@@ -18,7 +18,7 @@ definitions:
     properties:
       blockchain:
         type: string
-        enum: [ BTC, ETH, TRON, MATIC, BSC ]
+        enum: [ BTC, ETH, TRON, MATIC ]
         example: ETH
         x-nullable: false
       address:
@@ -68,7 +68,7 @@ definitions:
         x-omitempty: false
       blockchain:
         type: string
-        enum: [ ETH, TRON, MATIC, BSC ]
+        enum: [ ETH, TRON, MATIC ]
         example: ETH
         x-nullable: false
         x-omitempty: false

internal/db/repository/helpers.go

@@ -96,15 +96,6 @@ func NumericToMoney(num pgtype.Numeric, moneyType money.Type, ticker string, dec
 	return money.NewFromBigInt(moneyType, ticker, bigInt, decimals)
 }
 
-func NumericToCrypto(num pgtype.Numeric, currency money.CryptoCurrency) (money.Money, error) {
-	bigInt, err := NumericToBigInt(num)
-	if err != nil {
-		return money.Money{}, err
-	}
-
-	return currency.MakeAmountFromBigInt(bigInt)
-}
-
 func MoneyToNumeric(m money.Money) pgtype.Numeric {
 	bigInt, _ := m.BigInt()
 	return BigIntToNumeric(bigInt)

internal/kms/api/handler.go

@@ -29,7 +29,6 @@ func SetupRoutes(handler *Handler) httpServer.Opt {
 
 		kmsAPI.POST("/wallet/:walletId/transaction/eth", handler.CreateEthereumTransaction)
 		kmsAPI.POST("/wallet/:walletId/transaction/matic", handler.CreateMaticTransaction)
-		kmsAPI.POST("/wallet/:walletId/transaction/bsc", handler.CreateBSCTransaction)
 		kmsAPI.POST("/wallet/:walletId/transaction/tron", handler.CreateTronTransaction)
 	}
 }
@@ -181,47 +180,6 @@ func (h *Handler) CreateMaticTransaction(c echo.Context) error {
 	return c.JSON(http.StatusCreated, &model.EthereumTransaction{RawTransaction: raw})
 }
 
-func (h *Handler) CreateBSCTransaction(c echo.Context) error {
-	ctx := c.Request().Context()
-
-	id, err := common.UUID(c, paramWalletID)
-	if err != nil {
-		return err
-	}
-
-	w, err := h.wallets.GetWallet(ctx, id, false)
-
-	switch {
-	case errors.Is(err, wallet.ErrNotFound):
-		return common.NotFoundResponse(c, wallet.ErrNotFound.Error())
-	case err != nil:
-		return err
-	}
-
-	var req model.CreateBSCTransactionRequest
-	if valid := common.BindAndValidateRequest(c, &req); !valid {
-		return nil
-	}
-
-	raw, err := h.wallets.CreateBSCTransaction(ctx, w, wallet.EthTransactionParams{
-		Type:                 wallet.AssetType(req.AssetType),
-		Recipient:            req.Recipient,
-		ContractAddress:      req.ContractAddress,
-		Amount:               req.Amount,
-		NetworkID:            req.NetworkID,
-		Nonce:                *req.Nonce,
-		MaxPriorityFeePerGas: req.MaxPriorityPerGas,
-		MaxFeePerGas:         req.MaxFeePerGas,
-		Gas:                  req.Gas,
-	})
-
-	if err != nil {
-		return transactionCreationFailed(c, err)
-	}
-
-	return c.JSON(http.StatusCreated, &model.EthereumTransaction{RawTransaction: raw})
-}
-
 func (h *Handler) CreateTronTransaction(c echo.Context) error {
 	ctx := c.Request().Context()
 

internal/kms/api/handler_test.go

@@ -24,7 +24,6 @@ func TestHandlerRoutes(t *testing.T) {
 		walletRoute              = "/api/kms/v1/wallet/:walletId"
 		ethereumTransactionRoute = "/api/kms/v1/wallet/:walletId/transaction/eth"
 		polygonTransactionRoute  = "/api/kms/v1/wallet/:walletId/transaction/matic"
-		bscTransactionRoute      = "/api/kms/v1/wallet/:walletId/transaction/bsc"
 		tronTransactionRoute     = "/api/kms/v1/wallet/:walletId/transaction/tron"
 	)
 
@@ -241,88 +240,6 @@ func TestHandlerRoutes(t *testing.T) {
 		}
 	})
 
-	t.Run("CreateBSCTransaction", func(t *testing.T) {
-		const usdtContract = "0xdac17f958d2ee523a2206206994597c13d831ec7"
-
-		for testCaseIndex, testCase := range []struct {
-			wallet *wallet.Wallet
-			req    model.CreateBSCTransactionRequest
-			assert func(t *testing.T, res *test.Response)
-		}{
-			{
-				wallet: createWallet(wallet.BSC),
-				req: model.CreateBSCTransactionRequest{
-					AssetType:         "coin",
-					Amount:            "123",
-					Gas:               1,
-					MaxFeePerGas:      "123",
-					MaxPriorityPerGas: "456",
-					NetworkID:         1,
-					Nonce:             util.Ptr(int64(0)),
-					Recipient:         "0x690b9a9e9aa1c9db991c7721a92d351db4fac990",
-				},
-				assert: func(t *testing.T, res *test.Response) {
-					var body model.BSCTransaction
-
-					assert.Equal(t, http.StatusCreated, res.StatusCode(), res.String())
-					assert.NoError(t, res.JSON(&body))
-					assert.NotEmpty(t, body.RawTransaction)
-				},
-			},
-			{
-				wallet: createWallet(wallet.BSC),
-				req: model.CreateBSCTransactionRequest{
-					AssetType:         "token",
-					Amount:            "123",
-					ContractAddress:   usdtContract,
-					Gas:               1,
-					MaxFeePerGas:      "123",
-					MaxPriorityPerGas: "456",
-					NetworkID:         5,
-					Nonce:             util.Ptr(int64(0)),
-					Recipient:         "0x690b9a9e9aa1c9db991c7721a92d351db4fac990",
-				},
-				assert: func(t *testing.T, res *test.Response) {
-					var body model.BSCTransaction
-
-					assert.Equal(t, http.StatusCreated, res.StatusCode(), res.String())
-					assert.NoError(t, res.JSON(&body))
-					assert.NotEmpty(t, body.RawTransaction)
-				},
-			},
-			{
-				// blockchain mismatch
-				wallet: createWallet(wallet.ETH),
-				req: model.CreateBSCTransactionRequest{
-					AssetType:         "coin",
-					Amount:            "123",
-					Gas:               1,
-					MaxFeePerGas:      "123",
-					MaxPriorityPerGas: "456",
-					NetworkID:         1,
-					Nonce:             util.Ptr(int64(0)),
-					Recipient:         "0x690b9a9e9aa1c9db991c7721a92d351db4fac990",
-				},
-				assert: func(t *testing.T, res *test.Response) {
-					assert.Equal(t, http.StatusBadRequest, res.StatusCode(), res.String())
-				},
-			},
-		} {
-			t.Run(strconv.Itoa(testCaseIndex+1), func(t *testing.T) {
-				// ACT
-				res := tc.Client.
-					POST().
-					Path(bscTransactionRoute).
-					Param(paramWalletID, testCase.wallet.UUID.String()).
-					JSON(&testCase.req).
-					Do()
-
-				// ASSERT
-				testCase.assert(t, res)
-			})
-		}
-	})
-
 	t.Run("CreateTronTransaction", func(t *testing.T) {
 		const usdtContract = "TBnt7Wzvd226i24r95pE82MZpHba63ehQY"
 

internal/kms/app.go

@@ -63,7 +63,6 @@ func (app *App) runWebServer(ctx context.Context) {
 	walletGenerator := wallet.NewGenerator().
 		AddProvider(&wallet.EthProvider{Blockchain: wallet.ETH, CryptoReader: cryptorand.Reader}).
 		AddProvider(&wallet.EthProvider{Blockchain: wallet.MATIC, CryptoReader: cryptorand.Reader}).
-		AddProvider(&wallet.EthProvider{Blockchain: wallet.BSC, CryptoReader: cryptorand.Reader}).
 		AddProvider(&wallet.BitcoinProvider{Blockchain: wallet.BTC, CryptoReader: cryptorand.Reader}).
 		AddProvider(&wallet.TronProvider{
 			Blockchain:   wallet.TRON,

internal/kms/wallet/service.go

@@ -34,7 +34,11 @@ var (
 	ErrUnknownBlockchain      = errors.New("unknown blockchain")
 )
 
-func New(repo *Repository, generator *Generator, logger *zerolog.Logger) *Service {
+func New(
+	repo *Repository,
+	generator *Generator,
+	logger *zerolog.Logger,
+) *Service {
 	log := logger.With().Str("channel", "kms_service").Logger()
 
 	return &Service{
@@ -74,7 +78,9 @@ func (s *Service) DeleteWallet(ctx context.Context, id uuid.UUID) error {
 }
 
 // CreateEthereumTransaction creates and sings new raw Ethereum transaction based on provided input.
-func (s *Service) CreateEthereumTransaction(_ context.Context, wt *Wallet, params EthTransactionParams) (string, error) {
+func (s *Service) CreateEthereumTransaction(
+	_ context.Context, wallet *Wallet, params EthTransactionParams,
+) (string, error) {
 	if _, ok := s.generator.providers[ETH]; !ok {
 		return "", errors.New("ETH provider not found")
 	}
@@ -84,10 +90,12 @@ func (s *Service) CreateEthereumTransaction(_ context.Context, wt *Wallet, param
 		return "", errors.New("ETH provider is invalid")
 	}
 
-	return eth.NewTransaction(wt, params)
+	return eth.NewTransaction(wallet, params)
 }
 
-func (s *Service) CreateMaticTransaction(_ context.Context, wt *Wallet, params EthTransactionParams) (string, error) {
+func (s *Service) CreateMaticTransaction(
+	_ context.Context, wallet *Wallet, params EthTransactionParams,
+) (string, error) {
 	if _, ok := s.generator.providers[MATIC]; !ok {
 		return "", errors.New("MATIC provider not found")
 	}
@@ -97,20 +105,7 @@ func (s *Service) CreateMaticTransaction(_ context.Context, wt *Wallet, params E
 		return "", errors.New("MATIC provider is invalid")
 	}
 
-	return matic.NewTransaction(wt, params)
-}
-
-func (s *Service) CreateBSCTransaction(_ context.Context, wt *Wallet, params EthTransactionParams) (string, error) {
-	if _, ok := s.generator.providers[BSC]; !ok {
-		return "", errors.New("BSC provider not found")
-	}
-
-	bsc, ok := s.generator.providers[BSC].(*EthProvider)
-	if !ok {
-		return "", errors.New("BSC provider is invalid")
-	}
-
-	return bsc.NewTransaction(wt, params)
+	return matic.NewTransaction(wallet, params)
 }
 
 func (s *Service) CreateTronTransaction(